From 6ba0876560ba3522e79e6cb687c94736abed3498 Mon Sep 17 00:00:00 2001 From: Fomafix Date: Sat, 24 Sep 2016 20:51:32 +0200 Subject: [PATCH] SpecialRunJobs: Use wfHttpError to generate error messages wfHttpError generates HTML so the content fits to the Content-Type. Bug: T146546 Change-Id: Ia90f22564ecb3807aff3b787242bc74fe1678def --- includes/specials/SpecialRunJobs.php | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/includes/specials/SpecialRunJobs.php b/includes/specials/SpecialRunJobs.php index e1e2049d16..761610e08f 100644 --- a/includes/specials/SpecialRunJobs.php +++ b/includes/specials/SpecialRunJobs.php @@ -41,14 +41,10 @@ class SpecialRunJobs extends UnlistedSpecialPage { public function execute( $par = '' ) { $this->getOutput()->disable(); if ( wfReadOnly() ) { - // HTTP 423 Locked - HttpStatus::header( 423 ); - print 'Wiki is in read-only mode'; - + wfHttpError( 423, 'Locked', 'Wiki is in read-only mode.' ); return; } elseif ( !$this->getRequest()->wasPosted() ) { - HttpStatus::header( 400 ); - print 'Request must be POSTed'; + wfHttpError( 400, 'Bad Request', 'Request must be POSTed.' ); return; } @@ -58,8 +54,9 @@ class SpecialRunJobs extends UnlistedSpecialPage { $params = array_intersect_key( $this->getRequest()->getValues(), $required + $optional ); $missing = array_diff_key( $required, $params ); if ( count( $missing ) ) { - HttpStatus::header( 400 ); - print 'Missing parameters: ' . implode( ', ', array_keys( $missing ) ); + wfHttpError( 400, 'Bad Request', + 'Missing parameters: ' . implode( ', ', array_keys( $missing ) ) + ); return; } @@ -71,8 +68,7 @@ class SpecialRunJobs extends UnlistedSpecialPage { $verified = is_string( $providedSignature ) && hash_equals( $correctSignature, $providedSignature ); if ( !$verified || $params['sigexpiry'] < time() ) { - HttpStatus::header( 400 ); - print 'Invalid or stale signature provided'; + wfHttpError( 400, 'Bad Request', 'Invalid or stale signature provided.' ); return; } -- 2.20.1